Merge branch 'ExternalProject-verify-cmake-var' into release
Merge branch 'release'