CB-4891: Fixing errors in 3.1.0 and edge regarding connection permissions
CB-4891: Backporting to 2.9.0 and 3.0.0