Eng sio eng

Jira ticket CIDEVMI-1486