Merge commit 'b94963d38' into merge-2.4