issue #771
Merge branch '771' into develop