Merge "Drop legacy meta/config logic"