Merge pull request #23418 from scmmishra/better-logging-for-membership