Merge branch 'me/fetch-into-shallow-safety' into maint