v3.12
Merge branch 'master' into no_build_script