Merge "Guard against NPE" into rvc-qpr-dev