Merge remote-tracking branch 'origin/development' into development
Converted Translatable to a trait to maximize compatibility with other packages.