Merge commit '72201963350da86a5c200196364e18cbee70b3a5' * commit '72201963350da86a5c200196364e18cbee70b3a5': Fix issue #1806217.