Yeah this is something that is being actively worked on and hopefully will be fully solved in 4.26.2.