Merge "Remove FrameBufferImage" into devel/master