INT-3437 Polishing - PR Comments