[MOD-1491] Addressing CR comments