[Fixed] templates on two types of marauders

Change-Id: I90bd0d47c25896b054c051fa4c3e907852669060
Merge "[Fixed] templates on two types of marauders" into unstable