fixes #2624
Merge remote-tracking branch 'remotes/digi/fix-2624' into develop