merge of '6658e5575b2499bf86ecb1cd82850d65501856b4'