[#54814858] Compile fixes due to develop merge.