CKA stuff

Merged Dan Frumin requested to merge cka_stuff into master

Merge request reports