Fix for white ghost scenario discovery.
Fix for white ghost scenario discovery.
Merge stable.