Issue 868 & 869 Discussion