Bug/acm dsc 508 

See http://ourweb.nla.gov.au/apps/jira/browse/DSC-508 for the list of bugfixes.