Commit [a1d6b5] db/6255-6277  Maximize  Restore  History

Merge branch 'db/6255' into db/6255-6277