Merge pull request #3467 from joey0320/rocc-csr-fix

Rocc csr fix
8 jobs for dev
in 0 seconds and was queued for 0 seconds