Merge branch 'gh78' into 3.x