Merge branch 'gh73' into 3.x
Merge fix of gh73 to 2.x