INT-3204 Polishing - PR Comments