Merge remote-tracking branch 'remotes/upstream/1.3.2-release' into 1.3.2-release