Upstream version 200906R1