This has also been implemented in #888 :smile: