Missing DOMAIN attributes in multiple file output

We seem to have an issue with multiple file output and the trunk. The issue is reproducible with the ORCA2_ICE_PISCES reference configuration (just set "one_file" to "multiple_file" in file_def_nemo-pisces.xml and re-run a standard test). Everything runs fine but most of the mean files can not be rebuilt because the "DOMAIN_*" attributes are missing. grid_W and icemod files are OK but the rest are missing the attributes. This appears to be because of the mix of grid_?_[2,3]D and grid_?_[2,3D]_inner variables in the other files. Presumeably this stops the:

       if (singleDomain)
        this->writeLocalAttributes_IOIPSL(dimXid, dimYid,
                                          domain->ibegin,
                                          domain->ni,
                                          domain->jbegin,
                                          domain->nj,
                                          domain->ni_glo,domain->nj_glo,
                                          server->intraCommRank,server->intraCommSize);

call in XIOS' src/io/nc4_data_output.cpp routine from being called. The actual output grids are the same; the distinction is purely for XIOS's internal handling, but it looks as if we need to direct "inner" variables to different files if we want to have those attributes. Or can this be resolved on the XIOS side?