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

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

See merge request !77
1 job from dev-v3.3.1 in 0 seconds (queued for 18 seconds)
Status Job ID Name Coverage
  External
passed jenkins

00:00:07