resolves SPOT-1752