re #787 - Fixed un-scheduling
Merge branch 'feature/787-publish' into staging