Merge branch 'ramv/stlq' into charm