merge of '26ab4051ec6ee9153656e1ea57a1ea5c53aad6ce'