Merge branch 'playc' into master2
Merged playc files.