Daz, I’ll have a look soon.
Derek, I’ll merge the new changes with the 4.8 version as well with the next build