Created by: romanblack1
Addresses the same issue (#8116 (closed)) as the PR (#9766), but in the ruby client.