CS_MS MERGED GIT