Implements #899