Partially fixes NB#78521