Domestic EESS installation topology

I have an EESS based on a Victron Multiplus inverter. This has separate AC Input and Output connections so the entire house load is routed via the inverter.

This topology was not covered in either the text or diagrams of the 1st or 2nd editions of the Code of Practice (despite a representative from Victron being on the panel AFAIR). Has this omission now been rectified in the 3rd Edition?

Also, I have installed a changeover switch so I can bypass the inverter for maintenance or if it fails. I am thinking of replacing this with a contactor so if the inverter fails it changes over to grid supply automatically. Is this kind of arrangement compliant with the 3rd Edition?