Merge "Fix exception in ApiPageSet"