Merge branch 'develop' into 'master'

fix flit

See merge request !20
2 jobs for master in 1 minute and 51 seconds (queued for 1 second)