LPS-45853 Update Alloy 2.5.x to 7da98a7