Synced with master commit 5b72a7b..f44e6ac