add ror for next
Merge branch 'master' into jianw_dev