Make API on by default - fix
Merge branch '2.5.x' into saas