Sync with Stable

Mainly just CMake Changes