Merge pull request #5127 from tobiasd/20180525-register