Corrected Issues arising from Merge

Merged Latest Branches and fixed minor issues….