Merge branch 'access-creds'