issue #15504: Make registration work in all editions