Need to modified DataFormer and Messenger
Authored by: dezzyksvn 2017-01-05
Parent: [r5]
Child: [r7]
