Merge branches 'cmake' and 'vector-types'