commiting PW API v.18
Merge branch 'master' into dev_alex_updates