fixes #1351
Merge remote-tracking branch 'origin/pr/1699' into develop