Merge "Fixes NPE on null pkg" into rvc-dev