Fixed bug in fifoadm.
Merge branch 'test' into dev