Fix some regretions problem
Merge remote-tracking branch 'origin/c1_aug2012' into c1_aug2012