Issues #1787 and #1771 were fixed.
Merge remote-tracking branch 'origin/develop' into develop