LPS-42880 Fix backport for 6.1.x