Merge branch 'master' into wip_leon_T7199_adding_images_to_bolierplates