Merge remote-tracking branch 'origin/master' into 6042-master-reorg_crash