Merge "Fix NPE by returning empty params." into rvc-dev