merge of '1a467a7ea8dfd7463354c140383975aa0b8b20e8'