meier/plocSupervisor #13

Closed
meierj wants to merge 4 commits from meier/plocSupervisor into develop
No description provided.