INT-3088 Polishing - PR Comments