merge of '5075b3f69144c8ca977abda48869d41f724d1334'