Add changes for 3.0.28 stable