Merge "Resolve ambiguous argument." into rvc-dev