merge of '68c1dba00e182241b1e887487fb3c8271f9c0d01'