Upgrade to apm 0.58.0