Update Cmake branch with master changes