Yes, it is done already,
Testing it right now.
I thought about this before but somehow I forgot it before sending the PR ...