Merge pull request #7383 from neheb/squ