Merge branch 'origin/12-improve-cl-switch-output'
compile error on old GCC
fix warning