WCM-15 add changes specific to age rule