Issue #2542