merge of '2e1d9e05c5b3d9382dab5905a71f66a069c6915d'