Merge "Add keywords for a few settings" into rvc-dev