Merge "Fix NPE when removing PIP stack" into rvc-dev