K3.1 Crypsis fix avataroncat
K3.1 Crypsis fix avataroncat (part2)
Merge pull request #2451 from 810/K31-develop-bugs1

K3.1 Crypsis fix avataroncat