Sync with CM and add 3.4 version