Merge pull request #5068 from HanashiDev/registryhandler-rev