resolves SPOT-1807 spot-1814