Merge pull request #12096 from tohojo/sqm-scripts-dep-fix