merge of '178ad077ac028be1b22bf39a8144558596dbb686'