LPS-34707 fix issues after alloy migration