Merge "Updates following the PixelData change" into devel/master