At @wedaly these points are addressed in #1575