Bring embargo fixes to 6.4 branch