[1603] core.ui extension point fixes due to class moval