Merge "Enable NOVA_ENFORCE_SCOPE to True by default"