Merge "Fix for globalSubscriberId and requestId"