Merge "Improve documentation of fields in EditPage"