Issue #2832 was fixed, but test should be added.
Merge remote-tracking branch 'origin/develop' into develop