merge from KEEMI1 to fix cbd loop reset issue