merge of '2bc71b9b93f22417784c3a4ed3576a76841878f2'