Fixes and improvements to ACL file handling (OMS-281)