K3.1 Crypsis fixes
K3.1 Crypsis fix merge
K3.1 Crypsis msgfooter
K3.1 Crypsis mgsfooter part2
K3.1 Crypsis small msg issue
Merge pull request #2449 from 810/k3.1-develop-crypsis

K3.1 crypsis fixes