Issue #3498560 by phenaproxima, fjgarlin: EnabledSourceHandler should segment its storage more strongly