BATCHADM-144

See https://jira.springsource.org/browse/BATCHADM-144