Merge remote-tracking branch 'origin/1.3.1-wip' into 1.3.1-wip