Issue #2544