LPS-34021 Fix build