fix merge: move files from 6.3.3-6.4.0 to 6.3.6-6.4.0