Merge branch 'LFW-fix' into 'master'

lfw bug fix

See merge request !121
5 jobs for master in 26 minutes (queued for 4 seconds)