Merge pull request #166 from eric-wu/develop

Fix backfill
Merge remote-tracking branch 'base/develop' into develop