[JIRA Issue Raised](https://jira.spring.io/browse/INT-3422)