Merge "Add validation of the content model edited by EditPage"