INT-3320: Polishing for dependencies

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