final updates pre-7.x-3.0-alpha2