merge of '3a4c124aa9688e101e4d5547ad18d4512d45e47b'