PR96 Smoke

Rich-text via content_html path.