Merge "Add config option for enforce_scope"