enhance test coverage to CSR
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'