meta 2.0 changes, to fix

1 job for master in 15 minutes and 52 seconds (queued for 4 minutes and 30 seconds)