[3.9] Move registry to configuration