Merge "Fix problems in unicode template support"
tree: be5d318c52f6c94b74fbda01523e07eda11cf8ea
  1. common/
  2. functional/
  3. scenario/