Merge branch 't676' into po_ready
Merge branch 't689' into po_ready
Merge branch 't690' into po_ready
Merge branch 't691' into po_ready
Merge branch 't696' into po_ready
t617 remove client side validation
t617 errors are always shown in the right logical order
t617 fix merge conflict