Merge branch 'f-cvar-htmlfield'