Commit [179d15]  Maximize  Restore  History

Merge branch 'release-2-2' into release