ensure that an empty listener stats dict is not sent to the server
Merge branch '2.3.x' into 2.3.x-saas