Production run fixes
Merge branch 'release/0.4'