This Fixes #826
Merge branch 'pr/1069' into develop