#351560 started implementation of Registration