issue #776
Merge branch '776' into develop