Issue #2071 was fixed - without tests.
Merge remote-tracking branch 'origin/develop' into develop