INT-3396: Polishing

JIRA: https://jira.spring.io/browse/INT-3396