update cmake branch with base changes