fix merge: move new scripts from 6.2.5-6.3.0 to 6.2.6-6.30