Revert hack for listtotal
Merge branch 'dev' into ms