[release-3.7] Eng 4625 change catalog