INT-3460: fix as comments