merge of '376e6271722a4507ea977a475f9ff512db8e21d2'