Update to latest schema & Channels.xml from development nml2 repo