INT-3352 More PR Comments