Merge branch 'issue#35' into 'dev-v3.5.1'

Issue#35

See merge request !99
1 job for dev-v3.5.1 in 0 seconds (queued for 22 seconds)