Merge commit 'f4d091fbe1f4' into 4.next