Merge branch 'js/grep-mutex'