Fix Engine dupe

Closes #1361
Merge branch 'nightly' into marmot