Update to 3281:529a71ea091e