Switch master to next v1.30