Merge Release 2.2.1 to Master

ChangeLog Updated with changes