merged from bbatsov
merged from bbatsov
Clean merged