Merge commit '3df4850c0bc7c1c4591ac594b3c1540c2edd93a8' * commit '3df4850c0bc7c1c4591ac594b3c1540c2edd93a8': Fix issue 2459650.