Merge branch 't669' into po_ready
Merge branch 't711' into po_ready
Merge branch 't614' into po_ready
t716 fixed NPE
t716 fixed duplicate rec issue
t716 fixed duplicate issue plus NPE