finish Canned statement
fix canned statements
Merge branch 'canned_statement' into staging