singleton of object added to velocity context
Merge branch 'hotfix/singleton'