Moved references from v3 to s2 for dev "local" sources