Something like this should be in the works (as you both know), let’s hope it arrives soon and solves the issue.