JIRA fixes
Merge pull request #357 from ronkyo/spkir_dev

SPKIR JIRA CIDEVMI-1573