[#58701644] merged dev 3.0.x to UAT branch