Remove `default_scope`
Merge remote-tracking branch 'upstream/master' into sw/allow-api-request