Done: https://github.com/quattor/template-library-core/pull/42