Issue 6.11

17 Sep