This is already fixed for 2.85, which you can try on the Test Server.