Bug-2342: Fixing rpc-reply messages id's get mixed up