JIRA: https://jira.spring.io/browse/INT-3649 Polishing according to the PR comments Address PR comments