Resolves: NEO-5092 Change-Id: I544247a057a667ce6423f2e59ba4ca769e866479 Signed-off-by: Piotr Zdunowski <piotr.zdunowski@intel.com>