@caridy Can I merge this PR and file an issue or shall we wait?