regression test passed
Merge remote-tracking branch 'rui/master'