Pull in latest changes from cub