Merge commit 'v4.3.16'