Need to notify the service and not the class as doing do introduces a dependency cycle.
Retry the application of a template if it fails. This can happen if the service has been restarted just before the template is applied.
Merge branch 'hotfix/service'