Re #891 - Modification for better handling of edm:year