Callback registration by template, not template set any more
Merge branch 'feature/v9-ready' into develop