WL-3725 : Expand templates if property is set