Merge remote-tracking branch 'origin/v1.4.x'