Cleaned context interface and api for workstations.
Manual merge of workstation and context use from master.