Merge branch 'ds/fetch-disable-force-notice'