Merged 11 with 13 + updates