Apply develop's PR #789 to 1.4 branch