Merge #2294

Replaces #2294