merge of '1e7e45502df6c52d725444e6655b368305ffe8d6'