Merge branch 'yacc-work' into maint