[#58727872] Add some changes from the original repo