INT-3150 Code review changes