Merge "Allow custom collators in strict grammar" into rvc-dev