merge of 'd8bfa63aa913e7227790ba2d02253cfbecce61ab'