Finish the Rjb migration

Feature Branch: test/rjb-migration

Parent Task: #5731 (closed)

Related issues

• Blocks #5465 (closed)
• Blocks #6544 (closed)
• Blocks #5959 (closed)

Original created by @intrigeri on 6399 (Redmine)