Update config, type_traits from develop.