*template fix

Change-Id: Ic9d364dc52b541306b5ab8fd020e2cc924d7ba63
*enpoints fix

Change-Id: I048f77b35443b50938a2e5ab1a4638254699a392