Merge branch 'master' into wip_leon_T7094_logo_image_upload_in_boilerplate