[packaging] based on tip of upstream 3322b5b4967fc4b4e6541bce05e096e4ad4702e3