Merge "Fix preventable NPE & probable others" into rvc-dev