LPS-45997-fix-compile