Fix multiple entry
Merge branch 'dev-hen' into dev
Fix multiple entre in sl output