CMake fix for find_optional_package
Merge branch 'cmake-fix' into stable
Merge branch 'stable'