merge of '3bb98c788d34c3b10dae4f9f635695a0e8da61fc'