Merge "fix pagination and create package feature"