Merge commit '1655be46d2b7d45f071a6a1411ac8bd41c749c21' * commit '1655be46d2b7d45f071a6a1411ac8bd41c749c21': Fix issue #1837610 and #1753079