Merge of change 8a62ae5c3ed243458475a0ee3f65c53a7125e391 from master.