Merge branch 'ms/fetch-prune-configuration'