Included service in hashtree path.
Merge branch 'aae' into fifo