issue10598 review338511002
and unify layout of form view. issue8644 review262131002
issue6735 review39641002