resolves SPOT-1289