Corrected infinte recursion in htgt services plus minor changes
Merge branch 'dp10' into devel