Merge branch 'master' into wip_leon_T7899_updated_design_for_post_relese