merge of '964c681a84c5571ba63549014db4942cfa327c08'