**This change is not backward compatible !**