[v7r0] FIX: RSS not properly coupled with CS

Also fixed wrong indent on ResourceStatus