Merge commit '7fc9343c33dc5b97963dcd0a2e46d391ec333985' * commit '7fc9343c33dc5b97963dcd0a2e46d391ec333985': Log for issue 2203561.
Merge commit '7fc9343c33dc5b97963dcd0a2e46d391ec333985' * commit '7fc9343c33dc5b97963dcd0a2e46d391ec333985': Log for issue 2203561.