Merge "Add class for encoded image buffer" into devel/master