This is still an issue, but since you mentioned you'd work on this during the meeting I'll still merge to master as is in the meantime, to not block this pull request.