merge of '8ee5fde10ca72ef93660e0426265e0ddb8fd2ece'