merge of d3538e5f45f69d0b65a1d425359ba88009d3ef91