JIRA fixes
JIRA fixes
JIRA fixes
JIRA fixes
Merge pull request #348 from ronkyo/spkir_dev

Spkir JIRA CIDEVMI-1573