Integrating latest Brett changes