Merge "Revert API part of "Add page_props table access class""