Added more c*r macros.
Merge branch 'oubiwann/more-c-star-r-macros' into develop