chnages for last oe-core updates