Merge branch 'issue#20' into 'dev-v3.3.1'

Issue #20. Back out changes committed in issue#11

See merge request !77
1 job for dev-v3.3.1 in 0 seconds (queued for 18 seconds)