update to upstream rev 55105