5.4r21 & r22 Light probe crash

I am upgrading from r19 to r21 or r22 and I'm getting a crash loading a scene with light probes. There are 2 errors in the console:

"Error adding Enlighten prob set: Failed to allocate probe set XXXXX"

The native callstack:

Unity.exe!memmove() Unknown
Unity.exe!GetLightProbeProxyVolumeSample(struct LightProbeProxyVolumeContext const &,short,struct LightProbeProxyVolumeSample &) Unknown
Unity.exe!ForwardShaderRenderLoop::RenderForwardShadowMaps(struct ActiveLight const *,bool,enum Camera::RenderFlag,struct ShaderPassContext &) Unknown
Unity.exe!GfxDevice::ExecuteAsync(int,void (*)(struct GfxDeviceAsyncCommand::ArgScratch *,struct GfxDeviceAsyncCommand::Arg const *),struct GfxDeviceAsyncCommand::ArgScratch * *,struct GfxDeviceAsyncCommand::Arg const *,struct JobFence &) Unknown
Unity.exe!ForwardShaderRenderLoop::StartRenderJobs(struct JobFence &,bool,struct ShaderPassContext &) Unknown
Unity.exe!ForwardShaderRenderLoop:: PerformRendering(struct JobFence &,struct ActiveLight const *,struct ShadowJobData const &,bool,bool,bool,enum Camera::RenderFlag) Unknown
Unity.exe!DoForwardShaderRenderLoop(struct RenderLoopContext &,struct dynamic_array<struct RenderObjectData,8> &,struct CullResults const &,bool,bool,bool,enum Camera::RenderFlag) Unknown
Unity.exe!DoRenderLoop(struct RenderLoop &,enum RenderingPath,struct CullResults &,struct ShadowMapCache &,bool) Unknown
Unity.exe!Camera:: DoRender(struct CullResults &,struct SharedRendererScene const &,enum Camera::RenderFlag,void (*)(class Camera &,struct RenderLoop &,class RenderNodeQueue const &),class RenderNodeQueue const *) Unknown
Unity.exe!Camera::RenderEditorCamera(enum Camera::EditorDrawingMode,struct DrawGridParameters const *) Unknown
Unity.exe!Handles_CUSTOM_Internal_DrawCameraWithGrid(struct ReadOnlyScriptingObjectOfType<class Camera>,int,struct DrawGridParameters &) Unknown
0000000022951b7b() Unknown
0000000024369780() Unknown
0000000022d3a510() Unknown
0000000024369780() Unknown

 

Deleting light map data seems to "fix" this crash.

Until I rebuilt light maps and it crashed. Wheee.

 

Should be a fix in flight to address this (may not make b24)