Merge 'gh37' into 3.x