Merge "Add quit and fix HSM EBNF."