Merge branch 'gh73' into 3.x