merge of '0bb5f3998d4f44cc03385e6faf36b48a3e409038'