merge of '629d7abe4cdeb66f4256659308d040ed78152a2a'