Integrated changeset [5389] done on the trunk in the tag. This is needed for ESM configurations with transported carbon. P Cadule