Issue #2393767 by neardark: Update registry to work with D8