[#60899486] Hopefully solve loading problem
[#60899486] Merged conflicts