CLDINT-932 adoption to PLF4.0 (1)