Changes to the components table specific to the 5.0.x branch