(upstream git commits e2fe24d56ac4a90bf140c670ebea02dee6a599d6 and da9484bd6b4052ea6fb022d27bd7e75350d6cf76)