Updating Alloy to 2.0.x 9e066fb; LPS-39691
LPS-40540
LPS-39212 Rollback changes