merge of '558d7f8556530ca23dc6e4b7d687d6727d3a7397'