Sanne, I pushed #671, but leaving open since it sounds like you had something else to add.