this.q not the local q
version 1.1.6.2
Merge branch 'hotfix/1.1.6.2' into stable