JIRA Ref: https://jira.springframework.org/browse/ROO-1406