Pull out scoped version backfill
Merge remote-tracking branch 'base/develop' into develop
Merge pull request #365 from eric-wu/develop

Pull out scoped version backfill as it is completed