manual merge of Tom's 226b565