merge of '12edb579fffee6ffcbbed6a66d80c97b7705d000'