So my solution is not to upgrade - hopefully it will get fixed in the next release
Thanks for your help -