false not being returned on connection error
Merge branch '2.3.x' into 2.3.x-saas