Merge remote-tracking branch 'stevee/squid-zph-qos' into beyond-next