Updated to latest compute WAML and updated code for changes.
Merge pull request #2330 from christav/compute-update-and-fix

Updated to latest compute WAML and updated code for changes.