Includes #208 to get full release blog ready