Fix backfill problems.
One more backfill fix.
Merge remote-tracking branch 'base/develop' into develop
Merge pull request #166 from eric-wu/develop

Fix backfill