Merge branch 'master' into ch32_warning