merge of '02c31916f8203f8e8f2ded060c7f3756a95c9841'