Merge branch 'work.const-qstr' into work.misc