More merging of SERGEEV changes.