Merge branch 'master' into wip_leon_T7330_logo_uploader_padding