Merge branch 'js/grep-mutex' into next