Merge branch 'const-memeq'