Headers of user objects are now also added in extra header under some conditions