Part of #601