first merge of Mikhail with Brent and Cheryl