Fix custom payload and client brand handling (#2572)* Fix custom payload and client brand handling* Deprecate NMS impl for removal on 1.20 (commit: 7ce5daa)