Update 12/3 RC branch with the part of the hotfix we want permanently.