Merge patch to prevent nvelocity template problems under high load (concurrency problem)