Merge branch 'gh40' into 3.x