Merged #2783