Merge "Fixes all remaining potential NPEs related to pkg" into rvc-dev