merge of '8443ed9b025cfb5d5ec77c591f236b1227a47c5f'