Merge "Add changes for category wrapper" into main