Merge "DO NOT MERGE Fix NPE in executeDeletePackageLIF." into rvc-dev