Merge branch 'adapt_for_lc' into 'development'

Adapted for lc and made repairs

See merge request !109
9 jobs for development in 67 minutes and 15 seconds (queued for 3 seconds)