[packaging] based on v3.6