Resolve "cherry-pick #503 into branch 4.2"

Renaud Personrequested to merge
510-cherry-pick-503-into-branch-4-2 into branch_4.2

Closes #510 (closed)

Merge request reports