merge of 'e7503adc20d2a854905f468365cd82066ebed0d5'