LPS-43707 fix issues after alloy migration