[3136](https://github.com/feenkcom/gtoolkit/issues/3136) is no longer required as the changes have been merged upstream.