Note: This change is done in preparation of other changes that will come later. --HG-- branch : trunk