Merge "Fix unittests broken by 545808a"