[regressions] fixed regressions with merge