update from the traits on the core module
merge commit