Manual update, new version 2.1.4
Merge remote-tracking branch 'origin/develop' into develop