merge of '130abdbeeb7888b012bab591e834a85892fad020'