cherrypicked a064