Re #675 revert to 1.0.4
Merge remote-tracking branch 'origin/master'
Re #1124 productionMode