Update for v4.3
Merge branch 'master' into development