Synchronize with master commit 103a02a91c3a702151c6f0682aab43ff4a5a0b21.