Make namespace variable global
    Merge remote-tracking branch 'upstream/master'

    * upstream/master:
      Make namespace variable global