Fixing smarty tags.
Merge remote-tracking branch 'origin/b-dev' into b-dev