Raw must be static.
Merge branch 'static-raw' into develop