Merge branch 'feature/fix-start-triggers' into develop