Merge "Disable cache flush bit in existing announcement" into main