Partially fixes NB#77528