Aligning with changes from upstream
Merge branch 'MC147-RCFix' into MC147
Re-applying changes from before the merge.