Merge "Put status handling in EditPage into private function"