merge of '5973cff7074d3746ce1b548caf58e7dd6aae2826'