Issue #887 + Issue #886 + Issue #869