Merge "Fix comments of encoded image buffer" into devel/master