Merge pull request #6615 from MrPetovan/bug/6336-restore-legacy-register-constants