So further to this - I have a temporary fix which I have deployed if anyone has this issue. It also seems the bugfix is going to be released in 17.8.0 very soon