Merge changes from online site to prepare to return to static