dev/fend-1029 changes redone - had manual merging issues w/ tempates