Merge remote-tracking branch 'origin/luhui' into tianyi2
Merge remote-tracking branch 'origin/luhui' into tianyi2
Merge remote-tracking branch 'origin/luhui' into tianyi2
cleaned up code except for banded
Merge remote-tracking branch 'origin/tianyi2' into luhui