This fix ut_compability and a regression from 95280b19 Change-Id: I4a41e3c383fd8c8d31e844d2cd58fa82ef04fd00 GitLab: #579