fix
ppc
add UnitTest
Merge remote-tracking branch 'origin/develop' into develop