Apply diff anaconda-20.25.16-1..anaconda-21.48.21-1
Apply result of "git diff anaconda-18.37.11-1..anaconda-20.25.16-1" and resolve conflicts.