Merge pull request #2908 from castillofrancodamian/squid