[#147919] Fix unit tests
Merge branch 'US39'