CON-2277 | Handle floated headers