Use a new implementation that does not require core API changes.
Merge branch 'template-instance-cap-fix'
Set version number