recover the script& template changes moved to origin/closed-mergeAM