Import the rest of the 3.0.20 changes and remove the ones from 3.0.19