Merge "Remove jpg warning log" into devel/master