Fixes for integrate_local_content
Reworked splat_handler