Add changes for 3.0.23 stable