Merged changes from ~percona-core/percona-xtradb-cluster/release-5.5.30