Merge branch 'master' into pre_autogenerated