Merge "Fix build" into lmp-preview-dev