Merge commit 'd07a94426aa9a6341bf1744d7b97afe5330448a1' * commit 'd07a94426aa9a6341bf1744d7b97afe5330448a1': Log for issue 2203561.