Merge branch 'gh92' inti 3.x