Merge branch 'js/t3404-grammo-fix'