merge of '5ea326f3b26f2123d331eace3ce101ac2983534e'