LPS-42292; LPS-42630; LPS-34315; LPS-41883 - Updating Alloy 2.0.x to 5edb3c498032aee2d9c59c187993fecb75100a5c