t723 fix data export NPE issue
Merge branch 't723' into resolved