30311 - More work on Conditional Formatting - patch from Dmitriy