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