connection: 0.11 fixes
1.16.1