INT-3152: Backport polishing

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