[packaging] based on upstream master