Merge "Support L8 for jpeg and png" into devel/master