Merge branch 'master' into design_template
Merge branch 'design_template'