merge of '37e29e33ed5a8bc07374cf9980746d5aba2c6a90'