My fixed merged to upstream, and backported to stable git branch now. It'll be included in TW update, likely after 5.9.3 update.