Tagging 2.5.0rc1.  Updating files
Setting to turn off Online Storage
Merge branch 'next'