Merge "update template&mapping create view."