coreone_tech:fixes:start