Merge release v1.3.2 to master Upstream-commit: e6ec703df31f04c3ea3a6aeb19881494a6ae58ae Component: engine