Merge branch 'gh74' into 3.x