Merge branch 'master' into wip_alan_T5654_roojspacker_get_it_working_as