Case #2939 - Assessment registry changes (2)