Cherrypicked 6fef