(cherry picked from commit 0a5472e697)
0a5472e697
-Better template handling -Voice support -Stream support