Update cmake branch with newest yamlconfig changes.