HTML-504 - Make more functionality accessible via velocity
Mirebalais #884