Merge branch 'sg/clone-initial-fetch-configuration'