Merge branch 'master' into cff-retain-gids