update to support latest sdk/studio versions
Merge branch 'ws01' into ws02