Sam api upgrade
Merge branch 'development' into qa