Merge branch 'feature/toc-repair' into develop