manually merge PR #1437