compile v3
Merge branch 'refs/heads/master' into v3