Rebased repo to fix pack size issue