Issue #697 was partially fixed. It is needed for Issue #856 .
Merge remote-tracking branch 'origin/develop' into develop