CS - fixing large commit .
CS - api.js merge.