Adding upstream version 4.0~alpha20.
Adding upstream version 4.0~alpha21.