re #787 - Cleanup
Merge branch 'feature/787-publish' into staging