Merge branch 'smart_fix' into 'master'

Fix smart data collection

See merge request !523
2 jobs for master in 45 seconds (queued for 4 seconds)