INT-3233 Polishing - PR Comments