merge of '0dc157d146c11b00a52d985950481dd2a8c370de'