Issue #2035 was fixed.
Merge remote-tracking branch 'origin/develop' into develop