Merge "Fix NPE" into rvc-dev