Cherrypicked 0921a