Implements #1053