[packaging] based on tip of upstream maint-0.4 branch