Merge changes from HitmanReborn - https://www.thebuddyforum.com/demonbuddy-forum/plugins/trinity/179214-trinity-2-1-21-questtools-2-1-38-a-post1659748.html#post1659748