upstream 3.3.6
update ignores