merge of '6516a85d1d78f28686ffc271f1b433d8bc839bd1'