Merge pull request #1890 from gilmoskowitz/i24621_packageModPriv