Merge "Make NPatchData always use shared pointer" into devel/master