Merge server-sode global variables fix

until react-rails is updated with the PR from this same branch (if ever)