Merge "Fix NPE" into rvc-qpr-dev