Merge Bug: Missing Emissions

Notes and temporary fix
Merge pull request #1463 from benjchristensen/merge-1420

Merge Bug: Missing Emissions