Update missing changes for 3.0.9r4.