fix bulk history import
Merge branch 'commtrack' into staging2