INT-3369: change as Gary's comments