Switching to the 2.5.0 workflow