Merge remote-tracking branch 'origin/compatible' into georgeee/hf-test-go