[2.1.2] Add dist-upgrade