Resolve Issue 826 (pt 1)