Merge "EditPage: Mark public functions"