Resolves: NEO-3241 Change-Id: I726135ae55d1e0fcbacd80620e827ee5c7c0c8dc Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>