Merge commit '72b357c4eb1f99c01b38e5cdb1afa52b339648a8' * commit '72b357c4eb1f99c01b38e5cdb1afa52b339648a8': Fix issue 2194140, Part 1.