Implements #1083