Merge "Update spec and CMakeLists.txt" into devel/master