Added diag and improved autocomplete and fifoadm.
Merge branch 'test' into dev