Merge "Allow empty tokens in strict grammar" into rvc-dev