Orchestrator merge apr 21

Includes Julian's #178.