Fixing review findings. C2 S-PLAY Release added back