Merge commit '24bab491220f' into client-4.2