Changes to fix NB#110512