Merge branch 'master' into generate_dynamic