Merge branch 'master' into wip_leon_T7605_revamp_image_managment_code