Merging feather into unstable.