Issue #1983 and issue #2090 were fixed.
Merge remote-tracking branch 'origin/develop' into develop