merge of '178eac00dc5aa8338d42e8e203633bec7817bbf6'