Merge change 4629

* changes:
  Alter the HISTORY_PROJECTION and BookmarkColumns.