BOS1409089 additional change after report on test from Steinar
BOS1409089 additional change after report on test from Steinar