issue #859
Merge branch '859' into develop