sam api version upgrade
Merge branch 'development' into qa