Merge branch 'cc/access-on-aix-workaround'