[#43489171] Merged conflicts solved