LPS-51375; LPS-51274 - Updating Alloy 3.0.x to 3ddb5942bd6062b45a5cdbe5b5497d565e4146ff