Fix mako import
Merge branch 'hotfix/0.22.3'