Merge branch 'master' into wip_leon_T7975_caption_check_on_pasted_images