It did but unfortunately what is now wip/6.0 is not the same branch in which I worked on before I moved to the DBZ team. I will re-prepare the fix against master and submit a new PR.