Merge branch 'bw_issue_134' into 'develop'

issue 134

See merge request !476 (merged)

(cherry picked from commit 31529ec2)

9be3af99 Issue #135 (closed)