Commit 1a0b854b by Jure

Resolve conflicts and merge

parents 66c1c5b9 012df1ee
Pipeline #1299 failed with stage
in 1 minute 32 seconds