merge of '1d2340f5c0766711d217ca40fbfcb4cb196412ac'