Merge branch 'master' into wip_alan_T7290_looking_at_compiler_issues