[#58683740] Fixed merge conflicts.