Merge "[AVF] Make patch level diff flexible by a requirement" into main