Fix data migration for ACLs
Improved etag handling