Merge "Protect against NPE" into rvc-dev