Merge branch 'daywalker/cmake_option_sorting'