K3.1 Crypsis html fixes
K3.1 Crypsis html fixes (part2)
K3.1 Crypsis html fixes
Merge pull request #2500 from 810/k3.1-html-fix-1

K3.1 Crypsis html fixes