Even better fix, fixes unit tests too
Merge branch '2.5.x' into saas