Merge branch 'release/MjFmMT'
Merge tag '1.0.4' into develop

More settings