Add changes for 3.0.22 stable