Merge pull request #5101 from dibdot/sqm-fix