Merge branch 'master' into Reference-swapper-dev