bugfix
Merge remote-tracking branch 'origin/1.4.0-bugfix' into 1.4.0-wip