Merge branch 'cheese'
Merge branch 'cheese'
Merge branch 'cheese'
Merge branch 'cheese'
modify to make form declaration prior to form_template