classic-ui: fixed broken merge of 'support/1.9' branch into next

commit-id: d843035a521223213a565809bb089dad8b1ac791