Merge "PostHandshakeNodeProducer help class"