Fix merge of 'd6a093dc072a11e0429c3cfaa6ce6e1872af2adf'