bring cmake branch in line with experimental