manual merge of RobsBranch