issue #840
Merge branch '840' into develop