Merge "Maintain the page ID in WikiPage instead of relying on Title"