Merge commit '2be1045fd92ee1998a90f49ce3d335dfc5d95289' * commit '2be1045fd92ee1998a90f49ce3d335dfc5d95289': Fix issue 2422322 again.