merge of '6038f91a4dc42b25653eda3186b1f0679c03374a'