merge of '0f42cd616108360d027b0381a276d5b1a3cf26fa'