merge of '49118a4c6035353c0f8cf1aa30297dd36e43241f'