Includes optimizations for internal clients, but not enabled yet.