Merge branch 'master' into wip_leon_T7696_Journalist_delivery