[#56763040] perfomance fix