Merge "Change PixelData to use the handle/body pattern" into devel/master