LPS-40214 Finish method contract change introduced by commit a5df1d03d
LPS-39323 - Updating Alloy to 2.0.x e9f2c1860bca4ffc66df90dc77ec24a2c7ceae64