Merge "Update config.cmake"