Picked in Upgrade Plus #566, due to be adjudicated in Upgrade Plus #567!
Picked in Upgrade Plus #515 and adjudicated in Upgrade Plus #516