More rubicon 1.2 changes