Change Diazo rules for more adaptability
Update CHANGES
This refs affinitic #6062