Updated features to the 2.x branch
Updated profile2 in the make file