Part of #265