Commit [r2121] Maximize Restore History

branch release-2-1-2 created from trunk

reklov_w 2014-05-09