INT-3204 Polishing - PR Comments

JIRA: https://jira.springsource.org/browse/INT-3204