Merge remote branch 'smcv/unescaped-meta'