Manual merge of 4e3826228d43321abec7805f65b6d43d0f04ab06 in #269.