Thanks Enrico. I thought upgrade was the only way to resolve this, just wanted to confirm though.

The environment in question should be getting upgraded in the next 6-12 months, but this was for something that we was hoping to have live before then.