CS fix
Merge branch 'spr'