#657725 dak: please change override handling for Tag: header