EditView complete excluding upload image.
Merge commit '3e93a4b5edbfb3c670c2aae56738f72e4c2f8b43'