merge of '05dd48c35e7fc8bd8ec725a975682953f4e2eb8b'