Manually merged PR #2177