Merge branch 'dl/use-sq-from-test-lib'