update api version
Merge branch 'master' into 1.2.4
update api version