Merge branch 'bc/fetch-thin-less-aggressive-in-normal-repository'