merge of '613d006a5a3c8c6629c2a0b9a905bfc4a80484ca'