update api-version and modify internal variable names
Merge remote-tracking branch 'origin/master'