Further improvements on CR
Revert "Further improvements on CR"

This reverts commit 90dae2f79526fe0114c54234fe2f2c83d9369223.
Merge remote-tracking branch 'origin/master'