sync with CSRedux changes