Merge branch 'fix2/remove-plus' into 'dev'

Fix2/remove plus

See merge request !2
3 jobs for v0.4 in 59 seconds (queued for 2 seconds)
latest