synching to latest bug fixes in CHRR