Resolve #3609590 "Switch to official"

Closes #3609590

AI Written code

Edited by Marcus Johansson

Merge request reports

Loading