Preparations before upgrade

  Updated