Big update on vendor for new CM9 release