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