merge corebos changes