sp fix
Merge https://github.com/commoncriteria/application