SEC-2187

Addresses [SEC-2187](https://jira.springsource.org/browse/SEC-2187).