merge from cmake_parser for testing - cleanup pending after poc