Doesn't trigger some upgrade code for people that update from master-19 + empty foreach fixes