This PageControl patch passes all existing tests.