Merge branch 'anurse-updatetosdk2' into qa
Merge branch 'dev' into qa