fixed gh import behavior
Merge branch 'master' into platform