More specific Jira task: ICSHWI-5617

Please @tamaskerenyi, when you have a chance to take a look on modifications I did, I'd appreciate your feedback.

Note the IOC has been tested using the device available in Utgård lab.

Thanks, man!