I have tried to keep BC as much as possible (some other configs should probably get updated later) but it still needs a careful review !