Re #6287 Clean up the XML
Re #6287 Mandatory mask for IN5
Re #6617 Modifications to support ILL IN6