Merge with Valeriy