[#43223455] Merge conflicts resolved