merge of '0cf9456fa245ff793e08982af57529321f4f6576'