Final cleanup
Merge branch 'rr-ces' into staging