Merge 'gh37' into 3.x
Merge branch 'gh40' into 3.x