Merge branch 'jk/oideq-hasheq-cleanup'