merge changes from mozeintel