Resubmit to 2.3

Issue #2707