Update from hg 212:80543dbd036a