LPS-48577 Fix compile order