merge of '464f86e91e3d4d47be8a4dc58c4d915ae7e86599'