Merge branch 'master' into ConstructionOutpost. Fixes #6352.