Add changes for 3.0.27 stable