Merge branch 'master' into wip_alan_T5639_gitlive_general_tidy_ups