Merge "Implement remaining peek suppression logic" into main