Update core from master.
Update type_traits from master.