List agents fix
Merge branch 'dev' into testing