Merge branch 'jb/reset-q'